Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 11:59:23 +0000 (06:59 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 11:59:23 +0000 (06:59 -0500)
commit93bce63f052392bf8c98d70ec8ab8b532651a2d2
tree2534a938d242261172c1a232845bf04b5087b558
parenteae2c83f56304150752c9e80516871d7b3d77956
parentf217bc39779c72ff278a4ba817efec1d84d679be
Merge from mainline.
src/xdisp.c